302ce0
@@ -691,6 +691,13 @@
Server {
       this.serverManager = createServerManager(this, this);
     }
 
+    //Initialize table lock manager, and ensure that all write locks held previously
+    //are invalidated
+    this.tableLockManager = TableLockManager.createTableLockManager(conf, zooKeeper, serverName);
+    if (!masterRecovery) {
+      this.tableLockManager.reapAllTableWriteLocks();
+    }
+
     status.setStatus("Initializing ZK system trackers");
     initializeZKBasedSystemTrackers();
 
@@ -707,13 +714,6 @@
Server {
       startServiceThreads();
     }
 
-    //Initialize table lock manager, and ensure that all write locks held previously
-    //are invalidated
-    this.tableLockManager = TableLockManager.createTableLockManager(conf, zooKeeper, serverName);
-    if (!masterRecovery) {
-      this.tableLockManager.reapAllTableWriteLocks();
-    }
-
     // Wait for region servers to report in.
     this.serverManager.waitForRegionServers(status);
     // Check zk for region servers that are up but didn't register
